From: Kenichi Handa <handa@m17n.org>
Date: Thu, 8 Dec 2011 01:41:32 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1304^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1924591f11d009a1c575f24f386ed9bac48e91e6;p=emacs.git

merge trunk
---

1924591f11d009a1c575f24f386ed9bac48e91e6